Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 7 Jul 2010 12:15:48 +0000 (12:15 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 7 Jul 2010 12:15:48 +0000 (12:15 +0000)
commitea314e3a552f4c7ed58cc9b326e70456826d2d27
treeabd42730be716a900580a5f5c14cc277b0f96570
parentb1022e6af7b4b30ca2a329954d7a4839e522bb47
parent43707702d2011322a84f082d9723d6eb66923cf9
Merge from mainline.